clipboard: Split struct definitions into private header

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 134cbdd834d7655452ce37e3daeea29cd4abb0be..189143526785c2d4ca34f5298ff299e885bc368f 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -426,6 +426,7 @@ gtk_private_h_sources =             \
        gtkbuttonprivate.h      \
        gtkcairoblurprivate.h   \
        gtkcellareaboxcontextprivate.h  \
+       gtkclipboardprivate.h           \
        gtkcolorswatchprivate.h \
        gtkcoloreditorprivate.h \
        gtkcolorplaneprivate.h  \

diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index cbc497a3f27a1b6e7b58c252ea8144b15105cbe2..6ef8d7dcb22a7835cb9ccac8a265a263cef8cf66 100644 (file)
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "gtkclipboard.h"
+#include "gtkclipboardprivate.h"
 #include "gtkinvisible.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
@@ -112,8 +113,6 @@ enum {
   LAST_SIGNAL
 };
 
-typedef struct _GtkClipboardClass GtkClipboardClass;
-
 typedef struct _RequestContentsInfo RequestContentsInfo;
 typedef struct _RequestTextInfo RequestTextInfo;
 typedef struct _RequestRichTextInfo RequestRichTextInfo;
@@ -121,41 +120,6 @@ typedef struct _RequestImageInfo RequestImageInfo;
 typedef struct _RequestURIInfo RequestURIInfo;
 typedef struct _RequestTargetsInfo RequestTargetsInfo;
 
-struct _GtkClipboard 
-{
-  GObject parent_instance;
-
-  GdkAtom selection;
-
-  GtkClipboardGetFunc get_func;
-  GtkClipboardClearFunc clear_func;
-  gpointer user_data;
-  gboolean have_owner;
-
-  guint32 timestamp;
-
-  gboolean have_selection;
-  GdkDisplay *display;
-
-  GdkAtom *cached_targets;
-  gint     n_cached_targets;
-
-  gulong     notify_signal_id;
-  gboolean   storing_selection;
-  GMainLoop *store_loop;
-  guint      store_timeout;
-  gint       n_storable_targets;
-  GdkAtom   *storable_targets;
-};
-
-struct _GtkClipboardClass
-{
-  GObjectClass parent_class;
-
-  void (*owner_change) (GtkClipboard        *clipboard,
-                       GdkEventOwnerChange *event);
-};
-
 struct _RequestContentsInfo
 {
   GtkClipboardReceivedFunc callback;

diff --git a/gtk/gtkclipboardprivate.h b/gtk/gtkclipboardprivate.h
new file mode 100644 (file)
index 0000000..788bf75
--- /dev/null
+++ b/gtk/gtkclipboardprivate.h
@@ -0,0 +1,66 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Global clipboard abstraction.
+ */
+
+#ifndef __GTK_CLIPBOARD_PRIVATE_H__
+#define __GTK_CLIPBOARD_PRIVATE_H__
+
+#include <gtk/gtkclipboard.h>
+
+#define GTK_CLIPBOARD_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLIPBOARD, GtkClipboardClass))
+#define GTK_IS_CLIPBOARD_CLASS(klass)          (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLIPBOARD))
+#define GTK_CLIPBOARD_GET_CLASS(obj)            (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CLIPBOARD, GtkClipboardClass))
+
+typedef struct _GtkClipboardClass GtkClipboardClass;
+
+struct _GtkClipboard 
+{
+  GObject parent_instance;
+
+  GdkAtom selection;
+
+  GtkClipboardGetFunc get_func;
+  GtkClipboardClearFunc clear_func;
+  gpointer user_data;
+  gboolean have_owner;
+
+  guint32 timestamp;
+
+  gboolean have_selection;
+  GdkDisplay *display;
+
+  GdkAtom *cached_targets;
+  gint     n_cached_targets;
+
+  gulong     notify_signal_id;
+  gboolean   storing_selection;
+  GMainLoop *store_loop;
+  guint      store_timeout;
+  gint       n_storable_targets;
+  GdkAtom   *storable_targets;
+};
+
+struct _GtkClipboardClass
+{
+  GObjectClass parent_class;
+
+  void (*owner_change) (GtkClipboard        *clipboard,
+                       GdkEventOwnerChange *event);
+};
+
+#endif /* __GTK_CLIPBOARD_PRIVATE_H__ */